Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 30 May 2011 01:12:12 +0000 (18:12 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 30 May 2011 01:12:12 +0000 (18:12 -0700)
commit6a3b7453827b1f50c3629c62880798a01d673720
tree92737578f8496235d7e98017f092927c2f0508dc
parent90f1d46a0c5bc00130975d3637494ad9058c4f50
parent93aa787df22ea7da3b795f93c11f2298d5c39ed2
Merge from trunk.
ChangeLog
src/ChangeLog
src/coding.c
src/image.c